117. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:08:48 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

117.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/etc/importdemo11_old.xml2019-12-13 09:06:12 +0000
22021-05-13 09:08:48 +0000

117.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged00
Changed00
Inserted00
Removed1801

117.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

117.4 Active regular expressions

No regular expressions were active.

117.5 Comparison detail

1 <root>    
2  <config>    
3           
4   <web>    
5                
6    <default>    
7                     
8     <cms_home_page>    
9      porto_home_11_old    
10     </cms_home_page>    
11                     
12     <cms_no_route>    
13      no-route-2    
14     </cms_no_route>    
15                 
16    </default>    
17            
18   </web>    
19           
20   <cms>    
21                
22    <wysiwyg>    
23                     
24     <enabled>    
25      hidden    
26     </enabled>    
27                 
28    </wysiwyg>    
29            
30   </cms>    
31   »           
32   <design>    
33    »       »           
34    <header>    
35     »       »       »           
36     <logo_width>    
37     </logo_width>    
38     »       »       »           
39     <logo_height>    
40     </logo_height>    
41     »       »       »           
42     <logo_src>    
43      default/logo_red.png    
44     </logo_src>    
45     »       »           
46    </header>    
47    »           
48   </design>    
49   »           
50   <dev>    
51    »       »           
52    <js>    
53     »       »       »           
54     <merge_files>    
55      1    
56     </merge_files>    
57     »       »           
58    </js>    
59    »           
60   </dev>    
61           
62   <porto_settings>    
63                
64    <general>    
65                     
66     <boxed>    
67      wide    
68     </boxed>    
69                     
70     <layout>    
71      1140    
72     </layout>    
73                     
74     <disable_border_radius>    
75      1    
76     </disable_border_radius>    
77                     
78     <show_site_notice>    
79      0    
80     </show_site_notice>    
81                 
82    </general>    
83                
84    <header>    
85                     
86     <header_type>    
87      11    
88     </header_type>    
89                     
90     <new_skin>    
91      0    
92     </new_skin>    
93                     
94     <static_block>    
95      porto_custom_block_for_header    
96     </static_block>    
97                     
98     <sticky_header_logo>    
99     </sticky_header_logo>    
100                 
101    </header>    
102                
103    <footer>    
104                     
105     <footer_top>    
106      0    
107     </footer_top>    
108                     
109     <footer_top_block>    
110      custom    
111     </footer_top_block>    
112                     
113     <footer_top_custom>    
114     </footer_top_custom>    
115                     
116     <footer_middle>    
117      1    
118     </footer_middle>    
119                     
120     <footer_ribbon>    
121      0    
122     </footer_ribbon>    
123                     
124     <footer_ribbon_text>    
125      Ribbon Text    
126     </footer_ribbon_text>    
127                     
128     <footer_middle_column_1>    
129      custom    
130     </footer_middle_column_1>    
131                     
132     <footer_middle_column_1_custom>    
133      porto_footer_links    
134     </footer_middle_column_1_custom>    
135                     
136     <footer_middle_column_1_size>    
137      3    
138     </footer_middle_column_1_size>    
139                     
140     <footer_middle_column_2>    
141      custom    
142     </footer_middle_column_2>    
143                     
144     <footer_middle_column_2_custom>    
145      porto_footer_contact_information    
146     </footer_middle_column_2_custom>    
147                     
148     <footer_middle_column_2_size>    
149      3    
150     </footer_middle_column_2_size>    
151                     
152     <footer_middle_column_3>    
153      custom    
154     </footer_middle_column_3>    
155                     
156     <footer_middle_column_3_custom>    
157      porto_footer_features    
158     </footer_middle_column_3_custom>    
159                     
160     <footer_middle_column_3_size>    
161      3    
162     </footer_middle_column_3_size>    
163                     
164     <footer_middle_column_4>    
165      newsletter    
166     </footer_middle_column_4>    
167                     
168     <footer_middle_column_4_custom>    
169      porto_footer_links    
170     </footer_middle_column_4_custom>    
171                     
172     <footer_middle_column_4_size>    
173      3    
174     </footer_middle_column_4_size>    
175                     
176     <footer_middle_2>    
177      0    
178     </footer_middle_2>    
179                     
180     <footer_middle_2_column_1>    
181      custom    
182     </footer_middle_2_column_1>    
183                     
184     <footer_middle_2_column_1_custom>    
185      porto_footer_links    
186     </footer_middle_2_column_1_custom>    
187                     
188     <footer_middle_2_column_1_size>    
189      3    
190     </footer_middle_2_column_1_size>    
191                     
192     <footer_middle_2_column_2>    
193      custom    
194     </footer_middle_2_column_2>    
195                     
196     <footer_middle_2_column_2_custom>    
197      porto_footer_links    
198     </footer_middle_2_column_2_custom>    
199                     
200     <footer_middle_2_column_2_size>    
201      3    
202     </footer_middle_2_column_2_size>    
203                     
204     <footer_middle_2_column_3>    
205      custom    
206     </footer_middle_2_column_3>    
207                     
208     <footer_middle_2_column_3_custom>    
209      porto_footer_links    
210     </footer_middle_2_column_3_custom>    
211                     
212     <footer_middle_2_column_3_size>    
213      3    
214     </footer_middle_2_column_3_size>    
215                     
216     <footer_middle_2_column_4>    
217      custom    
218     </footer_middle_2_column_4>    
219                     
220     <footer_middle_2_column_4_custom>    
221      porto_footer_links    
222     </footer_middle_2_column_4_custom>    
223                     
224     <footer_middle_2_column_4_size>    
225      3    
226     </footer_middle_2_column_4_size>    
227                     
228     <footer_bottom>    
229      1    
230     </footer_bottom>    
231                     
232     <footer_store_switcher>    
233      0    
234     </footer_store_switcher>    
235                     
236     <footer_logo_src>    
237      default/logo_footer_red.png    
238     </footer_logo_src>    
239                     
240     <footer_bottom_copyrights>    
241      <![CDATA[&copy;Copyright 2020 by PORTO. All Rights Reserved.]]>    
242     </footer_bottom_copyrights>    
243                     
244     <footer_bottom_custom_1>    
245      porto_footer_bottom_custom_block    
246     </footer_bottom_custom_1>    
247                     
248     <footer_bottom_custom_2>    
249     </footer_bottom_custom_2>    
250                 
251    </footer>    
252                
253    <category>    
254                     
255     <alternative_image>    
256      1    
257     </alternative_image>    
258                     
259     <aspect_ratio>    
260      0    
261     </aspect_ratio>    
262                     
263     <ratio_width>    
264      300    
265     </ratio_width>    
266                     
267     <ratio_height>    
268      400    
269     </ratio_height>    
270                     
271     <rating_star>    
272      1    
273     </rating_star>    
274                     
275     <product_price>    
276      1    
277     </product_price>    
278                     
279     <actions>    
280      1    
281     </actions>    
282                     
283     <addtocompare>    
284      1    
285     </addtocompare>    
286                     
287     <addtowishlist>    
288      1    
289     </addtowishlist>    
290                     
291     <page_layout>    
292      2columns-left    
293     </page_layout>    
294                     
295     <category_description>    
296      main_column    
297     </category_description>    
298                     
299     <side_custom_block>    
300      porto_category_side_custom_block    
301     </side_custom_block>    
302                 
303    </category>    
304                
305    <category_grid>    
306                     
307     <product_type>    
308      1    
309     </product_type>    
310                     
311     <columns>    
312      4    
313     </columns>    
314                 
315    </category_grid>    
316                
317    <product>    
318                     
319     <product_image_size>    
320      6    
321     </product_image_size>    
322                     
323     <side_custom_block>    
324      porto_product_side_custom_block    
325     </side_custom_block>    
326                     
327     <main_custom_block>    
328     </main_custom_block>    
329                     
330     <main_custom_block2>    
331     </main_custom_block2>    
332                     
333     <move_addtolinks>    
334      0    
335     </move_addtolinks>    
336                     
337     <move_upsell_full>    
338      0    
339     </move_upsell_full>    
340                     
341     <page_layout>    
342      2columns-right    
343     </page_layout>    
344                     
345     <tab_full_background>    
346      0    
347     </tab_full_background>    
348                     
349     <custom_block_next_tab>    
350     </custom_block_next_tab>    
351                     
352     <upsell_columns>    
353      4    
354     </upsell_columns>    
355                     
356     <move_upsell>    
357      0    
358     </move_upsell>    
359                 
360    </product>    
361    »       »           
362    <newsletter>    
363     »       »       »           
364     <logo_src>    
365      default/logo_red.png    
366     </logo_src>    
367     »       »           
368    </newsletter>    
369                
370    <contacts>    
371                     
372     <enable>    
373      1    
374     </enable>    
375                     
376     <full_width>    
377      0    
378     </full_width>    
379                     
380     <address>    
381      Porto2 Store    
382     </address>    
383                     
384     <latitude>    
385      -34.398    
386     </latitude>    
387                     
388     <longitude>    
389      150.884    
390     </longitude>    
391                     
392     <zoom>    
393      18    
394     </zoom>    
395                     
396     <infoblock>    
397      <![CDATA[<div class="row">    
398      <div class="col-md-12">    
399          <i class="porto-icon-phone"></i>    
400          <p>0201 203 2032</p>    
401          <p>0201 203 2032</p>    
402      </div>    
403      </div>    
404      <div class="row">    
405      <div class="col-md-12">    
406          <i class="porto-icon-mobile"></i>    
407          <p>201-123-3922</p>    
408          <p>302-123-3928</p>    
409      </div>    
410      </div>    
411      <div class="row">    
412      <div class="col-md-12">    
413          <i class="porto-icon-mail-alt"></i>    
414          <p>porto@gmail.com</p>    
415          <p>porto@portotemplate.com</p>    
416      </div>    
417      </div>    
418      <div class="row">    
419      <div class="col-md-12">    
420          <i class="porto-icon-skype"></i>    
421          <p>porto_skype</p>    
422          <p>proto_template</p>    
423      </div>    
424      </div>]]>    
425     </infoblock>    
426                     
427     <customblock>    
428     </customblock>    
429                 
430    </contacts>    
431                
432    <custom_settings>    
433                     
434     <custom_style>    
435      <![CDATA[.page-header.type11 .navigation {    
436          text-align: left;    
437      }    
438      .page-header.type11 {    
439          border-top: 0;    
440      }    
441      @media (min-width: 768px) {    
442          .page-header.type11 .logo {    
443              margin: 30px 0;    
444          }    
445          .page-header.type11 .nav-sections {    
446              margin: 3px 0;    
447          }    
448          .page-header.type11 .navigation {    
449              padding: 0;    
450          }    
451      }    
452      .block-category-list {    
453          margin-bottom: 15px;    
454      }    
455      .products-grid .product-item .product-item-info.type3 .weltpixel-quickview.weltpixel_quickview_button_v2 {    
456          border-radius: 0 0 5px 5px;    
457          font-family: "Open Sans";    
458          letter-spacing: 0;    
459      }    
460      .price-box .price {    
461          font-family: "Open Sans";    
462          font-weight: 600;    
463      }]]>    
464     </custom_style>    
465                     
466     <custom_style_2>    
467      <![CDATA[]]>    
468     </custom_style_2>    
469                 
470    </custom_settings>    
471            
472   </porto_settings>    
473           
474   <porto_design>    
475                
476    <general>    
477                     
478     <theme_color>    
479      E13B3F    
480     </theme_color>    
481                 
482    </general>    
483                
484    <font>    
485                     
486     <custom>    
487      0    
488     </custom>    
489                     
490     <font_size>    
491     </font_size>    
492                     
493     <font_family>    
494     </font_family>    
495                     
496     <custom_font_family>    
497     </custom_font_family>    
498                     
499     <google_font_family>    
500     </google_font_family>    
501                     
502     <char_latin_ext>    
503     </char_latin_ext>    
504                     
505     <char_subset>    
506     </char_subset>    
507                 
508    </font>    
509                
510    <colors>    
511                     
512     <custom>    
513      1    
514     </custom>    
515                     
516     <text_color>    
517     </text_color>    
518                     
519     <link_color>    
520     </link_color>    
521                     
522     <link_hover_color>    
523     </link_hover_color>    
524                     
525     <button_bg_color>    
526     </button_bg_color>    
527                     
528     <button_text_color>    
529     </button_text_color>    
530                     
531     <button_hover_bg_color>    
532     </button_hover_bg_color>    
533                     
534     <button_hover_text_color>    
535     </button_hover_text_color>    
536                     
537     <addtowishlist_color>    
538     </addtowishlist_color>    
539                     
540     <addtowishlist_hover_color>    
541     </addtowishlist_hover_color>    
542                     
543     <addtocompare_color>    
544     </addtocompare_color>    
545                     
546     <addtocompare_hover_color>    
547     </addtocompare_hover_color>    
548                     
549     <breadcrumbs_bg_color>    
550      F7F7F7    
551     </breadcrumbs_bg_color>    
552                     
553     <breadcrumbs_color>    
554      777777    
555     </breadcrumbs_color>    
556                     
557     <breadcrumbs_links_color>    
558      777777    
559     </breadcrumbs_links_color>    
560                     
561     <breadcrumbs_links_hover_color>    
562      777777    
563     </breadcrumbs_links_hover_color>    
564                     
565     <sale_bg_color>    
566     </sale_bg_color>    
567                     
568     <sale_font_color>    
569     </sale_font_color>    
570                     
571     <new_bg_color>    
572     </new_bg_color>    
573                     
574     <new_font_color>    
575     </new_font_color>    
576                     
577     <price_slider_bg_color>    
578      E13B3F    
579     </price_slider_bg_color>    
580                     
581     <price_slider_handle_color>    
582      E13B3F    
583     </price_slider_handle_color>    
584                 
585    </colors>    
586                
587    <header>    
588                     
589     <custom>    
590      1    
591     </custom>    
592                     
593     <header_bgcolor>    
594     </header_bgcolor>    
595                     
596     <header_bg_image>    
597     </header_bg_image>    
598                     
599     <header_bordercolor>    
600     </header_bordercolor>    
601                     
602     <header_textcolor>    
603     </header_textcolor>    
604                     
605     <header_linkcolor>    
606     </header_linkcolor>    
607                     
608     <header_top_links_bgcolor>    
609      F7F7F7    
610     </header_top_links_bgcolor>    
611                     
612     <header_top_links_color>    
613     </header_top_links_color>    
614                     
615     <header_menu_bgcolor>    
616      transparent    
617     </header_menu_bgcolor>    
618                     
619     <header_menu_color>    
620      828385    
621     </header_menu_color>    
622                     
623     <header_menu_hover_bgcolor>    
624      transparent    
625     </header_menu_hover_bgcolor>    
626                     
627     <header_menu_hover_color>    
628      E13B3F    
629     </header_menu_hover_color>    
630                     
631     <header_menu_classicmenu_bgcolor>    
632     </header_menu_classicmenu_bgcolor>    
633                     
634     <header_menu_classicmenu_bordercolor>    
635     </header_menu_classicmenu_bordercolor>    
636                     
637     <header_menu_classicmenu_color>    
638     </header_menu_classicmenu_color>    
639                     
640     <header_menu_classicmenu_hover_bgcolor>    
641     </header_menu_classicmenu_hover_bgcolor>    
642                     
643     <header_menu_classicmenu_hover_color>    
644     </header_menu_classicmenu_hover_color>    
645                     
646     <header_search_bgcolor>    
647     </header_search_bgcolor>    
648                     
649     <header_search_text_color>    
650     </header_search_text_color>    
651                     
652     <header_search_bordercolor>    
653     </header_search_bordercolor>    
654                     
655     <header_minicart_bgcolor>    
656     </header_minicart_bgcolor>    
657                     
658     <header_minicart_color>    
659     </header_minicart_color>    
660                     
661     <header_minicart_icon_color>    
662     </header_minicart_icon_color>    
663                 
664    </header>    
665                
666    <footer>    
667                     
668     <custom>    
669      1    
670     </custom>    
671                     
672     <footer_top_bgcolor>    
673     </footer_top_bgcolor>    
674                     
675     <footer_top_color>    
676     </footer_top_color>    
677                     
678     <footer_top_link_color>    
679     </footer_top_link_color>    
680                     
681     <footer_top_link_hover_color>    
682     </footer_top_link_hover_color>    
683                     
684     <footer_middle_bgcolor>    
685      F7F7F7    
686     </footer_middle_bgcolor>    
687                     
688     <footer_middle_color>    
689      777777    
690     </footer_middle_color>    
691                     
692     <footer_middle_link_color>    
693      777777    
694     </footer_middle_link_color>    
695                     
696     <footer_middle_link_hover_color>    
697      777777    
698     </footer_middle_link_hover_color>    
699                     
700     <footer_middle_title_color>    
701      E13B3F    
702     </footer_middle_title_color>    
703                     
704     <footer_middle_links_icon_color>    
705      777777    
706     </footer_middle_links_icon_color>    
707                     
708     <footer_middle_ribbon_bgcolor>    
709     </footer_middle_ribbon_bgcolor>    
710                     
711     <footer_middle_ribbon_shadow_color>    
712      BD383B    
713     </footer_middle_ribbon_shadow_color>    
714                     
715     <footer_middle_ribbon_color>    
716     </footer_middle_ribbon_color>    
717                     
718     <footer_middle_2_bgcolor>    
719     </footer_middle_2_bgcolor>    
720                     
721     <footer_middle_2_color>    
722     </footer_middle_2_color>    
723                     
724     <footer_middle_2_link_color>    
725     </footer_middle_2_link_color>    
726                     
727     <footer_middle_2_link_hover_color>    
728     </footer_middle_2_link_hover_color>    
729                     
730     <footer_middle_2_title_color>    
731     </footer_middle_2_title_color>    
732                     
733     <footer_middle_2_links_icon_color>    
734     </footer_middle_2_links_icon_color>    
735                     
736     <footer_bottom_bgcolor>    
737      FFFFFF    
738     </footer_bottom_bgcolor>    
739                     
740     <footer_bottom_color>    
741     </footer_bottom_color>    
742                     
743     <footer_bottom_link_color>    
744     </footer_bottom_link_color>    
745                     
746     <footer_bottom_link_hover_color>    
747     </footer_bottom_link_hover_color>    
748                 
749    </footer>    
750                
751    <page>    
752                     
753     <custom>    
754      0    
755     </custom>    
756                     
757     <page_bgcolor>    
758     </page_bgcolor>    
759                     
760     <page_bg_image>    
761     </page_bg_image>    
762                     
763     <page_custom_style>    
764      <![CDATA[]]>    
765     </page_custom_style>    
766                 
767    </page>    
768                
769    <main>    
770                     
771     <custom>    
772      0    
773     </custom>    
774                     
775     <main_bgcolor>    
776     </main_bgcolor>    
777                     
778     <main_bg_image>    
779     </main_bg_image>    
780                     
781     <main_custom_style>    
782      <![CDATA[]]>    
783     </main_custom_style>    
784                 
785    </main>    
786            
787   </porto_design>    
788           
789   <mpsearch>    
790                
791    <general>    
792                     
793     <enabled>    
794      1    
795     </enabled>    
796                 
797    </general>    
798            
799   </mpsearch>    
800  </config>    
801 </root>